Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Make FOG_ENABLED a shader_def instead of material flag (#13783)" #13803

Merged
merged 1 commit into from
Jun 10, 2024
Merged

Revert "Make FOG_ENABLED a shader_def instead of material flag (#13783)" #13803

merged 1 commit into from
Jun 10, 2024

Conversation

alice-i-cecile
Copy link
Member

@alice-i-cecile alice-i-cecile commented Jun 10, 2024 •
edited
Loading

This reverts commit 3ced49f.

Relevant to #13802. This wasn't done quite right and partially broke fog.

@alice-i-cecile alice-i-cecile added D-Trivial Nice and easy! A great choice to get started with Bevy C-Bug An unexpected or incorrect behavior A-Rendering Drawing game state to the screen S-Needs-Review Needs reviewer attention (from anyone!) to move forward labels Jun 10, 2024
@mockersf mockersf added this to the 0.14 milestone Jun 10, 2024
@alice-i-cecile alice-i-cecile added this pull request to the merge queue Jun 10, 2024
@alice-i-cecile alice-i-cecile removed this from the 0.14 milestone Jun 10, 2024
@alice-i-cecile
Copy link
Member Author

@mockersf this doesn't need to be in the milestone, since the reverted PR is no longer in the milestone :)

Merged via the queue into bevyengine:main with commit d659a1f Jun 10, 2024
32 checks passed
@mockersf mockersf added this to the 0.14 milestone Jun 10, 2024
@mockersf
Copy link
Member

I already cherry picked the reverted PR, so it is in the milestone...

mockersf pushed a commit that referenced this pull request Jun 11, 2024
@alice-i-cecile @mockersf
Revert "Make FOG_ENABLED a shader_def instead of material flag (#13783)…
92176ce 
…" (#13803)

This reverts commit 3ced49f.

Relevant to #13802. This wasn't
done quite right and partially broke fog.

Co-authored-by: Alice Cecile <alice.i.cecil@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dmyyy dmyyy dmyyy approved these changes

@atlv24 atlv24 atlv24 approved these changes

@IceSentry IceSentry IceSentry approved these changes

@pcwalton pcwalton Awaiting requested review from pcwalton

Assignees
No one assigned
Labels
A-Rendering Drawing game state to the screen C-Bug An unexpected or incorrect behavior D-Trivial Nice and easy! A great choice to get started with Bevy S-Needs-Review Needs reviewer attention (from anyone!) to move forward
Projects
None yet
Milestone
0.14
Development

Successfully merging this pull request may close these issues.
5 participants
@alice-i-cecile @mockersf @IceSentry @atlv24 @dmyyy